Redo (and complete) movement of all pointer types into pointer_data in the GtkArg...

diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index 30a0d0d6519635a3155c5bea56d71f1778c3b85e..3a5809b30ae9e683257cae868009d03bbc33c242 100644 (file)
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -524,7 +524,7 @@ gtk_arg_copy (GtkArg         *src_arg,
   dest_arg->d = src_arg->d;
 
   if (src_arg->type == GTK_TYPE_STRING)
-    dest_arg->d.string_data = g_strdup (src_arg->d.string_data);
+    dest_arg->d.pointer_data = g_strdup (src_arg->d.pointer_data);
 
   return dest_arg;
 }

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 3f390c3f4365355e7565f3c01338ed4d442f9590..40c984c129fabfea0c783c0808ccaf01598261a1 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -106,9 +106,7 @@ struct _GtkArg
     gulong ulong_data;
     gfloat float_data;
     gdouble double_data;
-    gchar *string_data;
     gpointer pointer_data;
-    GtkObject *object_data;
     struct {
       GtkCallbackMarshal marshal;
       gpointer data;
@@ -141,14 +139,14 @@ struct _GtkArg
 #define GTK_VALUE_ULONG(a)     ((a).d.ulong_data)
 #define GTK_VALUE_FLOAT(a)     ((a).d.float_data)
 #define GTK_VALUE_DOUBLE(a)    ((a).d.double_data)
-#define GTK_VALUE_STRING(a)    ((a).d.string_data)
+#define GTK_VALUE_STRING(a)    ((a).d.pointer_data)
 #define GTK_VALUE_ENUM(a)      ((a).d.int_data)
 #define GTK_VALUE_FLAGS(a)     ((a).d.int_data)
 #define GTK_VALUE_BOXED(a)     ((a).d.pointer_data)
 #define GTK_VALUE_FOREIGN(a)   ((a).d.foreign_data)
 #define GTK_VALUE_CALLBACK(a)  ((a).d.callback_data)
 #define GTK_VALUE_ARGS(a)      ((a).d.args_data)
-#define GTK_VALUE_OBJECT(a)    ((a).d.object_data)
+#define GTK_VALUE_OBJECT(a)    ((a).d.pointer_data)
 #define GTK_VALUE_POINTER(a)   ((a).d.pointer_data)
 #define GTK_VALUE_SIGNAL(a)    ((a).d.signal_data)
 #define GTK_VALUE_C_CALLBACK(a) ((a).d.c_callback_data)